auto upstream
authorJoakim Verona <joakim@verona.se>
Tue, 25 Dec 2012 17:21:29 +0000 (18:21 +0100)
committerJoakim Verona <joakim@verona.se>
Tue, 25 Dec 2012 17:21:29 +0000 (18:21 +0100)

Trivial merge